Remove an accidentally leftover duplicate pixbuf creation. (#314700,

2005-08-29  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkiconcache.c (_gtk_icon_cache_get_icon): Remove an
	accidentally leftover duplicate pixbuf creation.  (#314700,
	Kjartan Maraas)

diff --git a/ChangeLog b/ChangeLog
index fd4b5b3cbd2a718447c0c0462c0985fba8893d11..dfa0830df55cff2fecd886c71f9dba3a59935111 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2005-08-29  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkiconcache.c (_gtk_icon_cache_get_icon): Remove an
+       accidentally leftover duplicate pixbuf creation.  (#314700,
+       Kjartan Maraas)
+
        * gtk/gtksettings.c (settings_update_cursor_theme): Don't 
        leak the cursor theme name.  (#314693, Kjartan Maraas)
 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index fd4b5b3cbd2a718447c0c0462c0985fba8893d11..dfa0830df55cff2fecd886c71f9dba3a59935111 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,9 @@
 2005-08-29  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkiconcache.c (_gtk_icon_cache_get_icon): Remove an
+       accidentally leftover duplicate pixbuf creation.  (#314700,
+       Kjartan Maraas)
+
        * gtk/gtksettings.c (settings_update_cursor_theme): Don't 
        leak the cursor theme name.  (#314693, Kjartan Maraas)
 

diff --git a/gtk/gtkiconcache.c b/gtk/gtkiconcache.c
index 2af6958de786af13b0ef77821175e03fba16494c..d6f685065b0e9dfd916da203aaca7cd160c8085b 100644 (file)
--- a/gtk/gtkiconcache.c
+++ b/gtk/gtkiconcache.c
@@ -378,8 +378,6 @@ _gtk_icon_cache_get_icon (GtkIconCache *cache,
       return NULL;
     }
 
-  pixbuf = gdk_pixbuf_from_pixdata (&pixdata, FALSE, &error);
-
   pixbuf = gdk_pixbuf_new_from_data (pixdata.pixel_data, GDK_COLORSPACE_RGB,
                                     (pixdata.pixdata_type & GDK_PIXDATA_COLOR_TYPE_MASK) == GDK_PIXDATA_COLOR_TYPE_RGBA,
                                     8, pixdata.width, pixdata.height, pixdata.rowstride,